Make the demos build

diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am
index 8c15e166335f4c7728105a65a069a6c0b351c262..a6d4648198ce542bd582f8f8d60fd2f75f0008cd 100644 (file)
--- a/demos/gtk-demo/Makefile.am
+++ b/demos/gtk-demo/Makefile.am
@@ -92,11 +92,11 @@ AM_CPPFLAGS = \
        $(GTK_DEP_CFLAGS)
 
 DEPS = \
-       $(top_builddir)/gtk/libgtk-3.la
+       $(top_builddir)/gtk/libgtk-4.la
 
 LDADDS = \
-       $(top_builddir)/gtk/libgtk-3.la         \
-       $(top_builddir)/gdk/libgdk-3.la         \
+       $(top_builddir)/gtk/libgtk-4.la         \
+       $(top_builddir)/gdk/libgdk-4.la         \
        $(GTK_DEP_LIBS)                         \
        $(GDK_DEP_LIBS)                         \
        -lm
@@ -106,10 +106,10 @@ AM_CPPFLAGS += $(FONTDEMO_CFLAGS)
 LDADDS += $(FONTDEMO_LIBS)
 endif
 
-bin_PROGRAMS = gtk3-demo gtk3-demo-application
+bin_PROGRAMS = gtk4-demo gtk4-demo-application
 
 desktopdir = $(datadir)/applications
-dist_desktop_DATA = gtk3-demo.desktop
+dist_desktop_DATA = gtk4-demo.desktop
 
 BUILT_SOURCES = demos.h demo_resources.c
 
@@ -132,22 +132,22 @@ demos.h: $(demos) geninclude.pl
 demos.h.win32: $(demos_base) geninclude.pl
         $(AM_V_GEN) (here=`pwd` ; cd $(srcdir) && $(PERL) $$here/geninclude.pl $(demos_base)) > demos.h.win32
 
-nodist_gtk3_demo_SOURCES = demos.h
+nodist_gtk4_demo_SOURCES = demos.h
 
-gtk3_demo_SOURCES =            \
+gtk4_demo_SOURCES =            \
        $(demos)                \
        demo_resources.c        \
        main.c
 
-gtk3_demo_DEPENDENCIES = $(DEPS)
-gtk3_demo_LDADD = $(LDADDS)
-gtk3_demo_LDFLAGS = -export-dynamic
+gtk4_demo_DEPENDENCIES = $(DEPS)
+gtk4_demo_LDADD = $(LDADDS)
+gtk4_demo_LDFLAGS = -export-dynamic
 
-gtk3_demo_application_SOURCES = \
+gtk4_demo_application_SOURCES = \
        application.c           \
        demo_resources.c
 
-gtk3_demo_application_LDADD = $(LDADDS)
+gtk4_demo_application_LDADD = $(LDADDS)
 
 resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(builddir)/demo.gresource.xml)
 
@@ -164,12 +164,12 @@ appsicon48dir = $(iconthemedir)/48x48/apps
 appsicon256dir = $(iconthemedir)/256x256/apps
 appsiconscalabledir = $(iconthemedir)/scalable/apps
 
-dist_appsicon16_DATA = data/16x16/gtk3-demo.png data/16x16/gtk3-demo-symbolic.symbolic.png
-dist_appsicon22_DATA = data/22x22/gtk3-demo.png data/22x22/gtk3-demo-symbolic.symbolic.png
-dist_appsicon24_DATA = data/24x24/gtk3-demo.png data/24x24/gtk3-demo-symbolic.symbolic.png
-dist_appsicon32_DATA = data/32x32/gtk3-demo.png data/32x32/gtk3-demo-symbolic.symbolic.png
-dist_appsicon48_DATA = data/48x48/gtk3-demo.png data/48x48/gtk3-demo-symbolic.symbolic.png
-dist_appsicon256_DATA = data/256x256/gtk3-demo.png data/256x256/gtk3-demo-symbolic.symbolic.png
+dist_appsicon16_DATA = data/16x16/gtk4-demo.png data/16x16/gtk4-demo-symbolic.symbolic.png
+dist_appsicon22_DATA = data/22x22/gtk4-demo.png data/22x22/gtk4-demo-symbolic.symbolic.png
+dist_appsicon24_DATA = data/24x24/gtk4-demo.png data/24x24/gtk4-demo-symbolic.symbolic.png
+dist_appsicon32_DATA = data/32x32/gtk4-demo.png data/32x32/gtk4-demo-symbolic.symbolic.png
+dist_appsicon48_DATA = data/48x48/gtk4-demo.png data/48x48/gtk4-demo-symbolic.symbolic.png
+dist_appsicon256_DATA = data/256x256/gtk4-demo.png data/256x256/gtk4-demo-symbolic.symbolic.png
 
 update_icon_cache = $(top_builddir)/gtk/gtk-update-icon-cache$(EXEEXT) --ignore-theme-index --force
 
@@ -185,19 +185,19 @@ uninstall-update-icon-cache:
        test -n "$(DESTDIR)" || $(update_icon_cache) "$(iconthemedir)"
 
 # ------------------- MSVC Build Items ----------------
-MSVCPROJS = gtk3-demo gtk3-demo-application
+MSVCPROJS = gtk4-demo gtk4-demo-application
 
-gtk3_demo_FILES = $(gtk3_demo_SOURCES)
-gtk3_demo_EXCLUDES = font_features.c|pagesetup.c
+gtk4_demo_FILES = $(gtk4_demo_SOURCES)
+gtk4_demo_EXCLUDES = font_features.c|pagesetup.c
 
-gtk3_demo_application_FILES = $(gtk3_demo_application_SOURCES)
-gtk3_demo_application_EXCLUDES = dummy
+gtk4_demo_application_FILES = $(gtk4_demo_application_SOURCES)
+gtk4_demo_application_EXCLUDES = dummy
 
 include $(top_srcdir)/build/Makefile.msvcproj
 
 dist-hook: \
-       $(top_builddir)/build/win32/vs9/gtk3-demo.vcproj        \
-       $(top_builddir)/build/win32/vs9/gtk3-demo-application.vcproj
+       $(top_builddir)/build/win32/vs9/gtk4-demo.vcproj        \
+       $(top_builddir)/build/win42/vs9/gtk4-demo-application.vcproj
 
 DISTCLEANFILES = demos.h demos.h.win32
 

diff --git a/demos/gtk-demo/data/16x16/gtk3-demo-symbolic.symbolic.png b/demos/gtk-demo/data/16x16/gtk3-demo-symbolic.symbolic.png
deleted file mode 100644 (file)
index 945c632..0000000
Binary files a/demos/gtk-demo/data/16x16/gtk3-demo-symbolic.symbolic.png and /dev/null differ

diff --git a/demos/gtk-demo/data/16x16/gtk3-demo.png b/demos/gtk-demo/data/16x16/gtk3-demo.png
deleted file mode 100644 (file)
index 604e6c5..0000000
Binary files a/demos/gtk-demo/data/16x16/gtk3-demo.png and /dev/null differ

diff --git a/demos/gtk-demo/data/22x22/gtk3-demo-symbolic.symbolic.png b/demos/gtk-demo/data/22x22/gtk3-demo-symbolic.symbolic.png
deleted file mode 100644 (file)
index dbe69aa..0000000
Binary files a/demos/gtk-demo/data/22x22/gtk3-demo-symbolic.symbolic.png and /dev/null differ

diff --git a/demos/gtk-demo/data/22x22/gtk3-demo.png b/demos/gtk-demo/data/22x22/gtk3-demo.png
deleted file mode 100644 (file)
index 9bf42e8..0000000
Binary files a/demos/gtk-demo/data/22x22/gtk3-demo.png and /dev/null differ

diff --git a/demos/gtk-demo/data/24x24/gtk3-demo-symbolic.symbolic.png b/demos/gtk-demo/data/24x24/gtk3-demo-symbolic.symbolic.png
deleted file mode 100644 (file)
index 21d0ac1..0000000
Binary files a/demos/gtk-demo/data/24x24/gtk3-demo-symbolic.symbolic.png and /dev/null differ

diff --git a/demos/gtk-demo/data/24x24/gtk3-demo.png b/demos/gtk-demo/data/24x24/gtk3-demo.png
deleted file mode 100644 (file)
index 7136592..0000000
Binary files a/demos/gtk-demo/data/24x24/gtk3-demo.png and /dev/null differ

diff --git a/demos/gtk-demo/data/256x256/gtk3-demo-symbolic.symbolic.png b/demos/gtk-demo/data/256x256/gtk3-demo-symbolic.symbolic.png
deleted file mode 100644 (file)
index ef5305d..0000000
Binary files a/demos/gtk-demo/data/256x256/gtk3-demo-symbolic.symbolic.png and /dev/null differ

diff --git a/demos/gtk-demo/data/256x256/gtk3-demo.png b/demos/gtk-demo/data/256x256/gtk3-demo.png
deleted file mode 100644 (file)
index 2a59889..0000000
Binary files a/demos/gtk-demo/data/256x256/gtk3-demo.png and /dev/null differ

diff --git a/demos/gtk-demo/data/32x32/gtk3-demo-symbolic.symbolic.png b/demos/gtk-demo/data/32x32/gtk3-demo-symbolic.symbolic.png
deleted file mode 100644 (file)
index d212a0f..0000000
Binary files a/demos/gtk-demo/data/32x32/gtk3-demo-symbolic.symbolic.png and /dev/null differ

diff --git a/demos/gtk-demo/data/32x32/gtk3-demo.png b/demos/gtk-demo/data/32x32/gtk3-demo.png
deleted file mode 100644 (file)
index 9d046bb..0000000
Binary files a/demos/gtk-demo/data/32x32/gtk3-demo.png and /dev/null differ

diff --git a/demos/gtk-demo/data/48x48/gtk3-demo-symbolic.symbolic.png b/demos/gtk-demo/data/48x48/gtk3-demo-symbolic.symbolic.png
deleted file mode 100644 (file)
index 93fa6b7..0000000
Binary files a/demos/gtk-demo/data/48x48/gtk3-demo-symbolic.symbolic.png and /dev/null differ

diff --git a/demos/gtk-demo/data/48x48/gtk3-demo.png b/demos/gtk-demo/data/48x48/gtk3-demo.png
deleted file mode 100644 (file)
index d351788..0000000
Binary files a/demos/gtk-demo/data/48x48/gtk3-demo.png and /dev/null differ

diff --git a/demos/gtk-demo/data/512x512/gtk3-demo-symbolic.symbolic.png b/demos/gtk-demo/data/512x512/gtk3-demo-symbolic.symbolic.png
deleted file mode 100644 (file)
index 7746398..0000000
Binary files a/demos/gtk-demo/data/512x512/gtk3-demo-symbolic.symbolic.png and /dev/null differ

diff --git a/demos/gtk-demo/data/512x512/gtk3-demo.png b/demos/gtk-demo/data/512x512/gtk3-demo.png
deleted file mode 100644 (file)
index d6d38cb..0000000
Binary files a/demos/gtk-demo/data/512x512/gtk3-demo.png and /dev/null differ

diff --git a/demos/gtk-demo/gtk3-demo.desktop b/demos/gtk-demo/gtk3-demo.desktop
deleted file mode 100644 (file)
index 0b03708..0000000
--- a/demos/gtk-demo/gtk3-demo.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=GTK+ Demo
-Comment=GTK+ code examples and demonstrations
-Exec=gtk3-demo
-Icon=gtk3-demo
-Terminal=false
-Type=Application
-StartupNotify=true
-Categories=Development;GTK;
-NoDisplay=true

diff --git a/demos/icon-browser/Makefile.am b/demos/icon-browser/Makefile.am
index 9b13796cbe08755c52a90cc073a2e8fe36cfcc6a..111ce3520b7ebf46b35c997a4d204d89fe8d9f73 100644 (file)
--- a/demos/icon-browser/Makefile.am
+++ b/demos/icon-browser/Makefile.am
@@ -6,17 +6,17 @@ AM_CPPFLAGS = \
        $(GTK_DEP_CFLAGS)
 
 LDADD = \
-        $(top_builddir)/gtk/libgtk-3.la \
-        $(top_builddir)/gdk/libgdk-3.la \
+        $(top_builddir)/gtk/libgtk-4.la \
+        $(top_builddir)/gdk/libgdk-4.la \
         $(GTK_DEP_LIBS)
 
 
-bin_PROGRAMS = gtk3-icon-browser
+bin_PROGRAMS = gtk4-icon-browser
 
 desktopdir = $(datadir)/applications
-dist_desktop_DATA = gtk3-icon-browser.desktop
+dist_desktop_DATA = gtk4-icon-browser.desktop
 
-gtk3_icon_browser_SOURCES = \
+gtk4_icon_browser_SOURCES = \
        main.c \
        iconbrowserapp.c iconbrowserapp.h \
        iconbrowserwin.c iconbrowserwin.h \
@@ -36,13 +36,13 @@ EXTRA_DIST = \
        window.ui
 
 # ------------------- MSVC Build Items ----------------
-MSVCPROJS = gtk3-icon-browser
+MSVCPROJS = gtk4-icon-browser
 
-gtk3_icon_browser_FILES = $(gtk3_icon_browser_SOURCES)
-gtk3_icon_browser_EXCLUDES = dummy
+gtk4_icon_browser_FILES = $(gtk4_icon_browser_SOURCES)
+gtk4_icon_browser_EXCLUDES = dummy
 
 include $(top_srcdir)/build/Makefile.msvcproj
 
-dist-hook: $(top_builddir)/build/win32/vs9/gtk3-icon-browser.vcproj
+dist-hook: $(top_builddir)/build/win32/vs9/gtk4-icon-browser.vcproj
 
 -include $(top_srcdir)/git.mk

diff --git a/demos/icon-browser/gtk3-icon-browser.desktop b/demos/icon-browser/gtk3-icon-browser.desktop
deleted file mode 100644 (file)
index c1a546e..0000000
--- a/demos/icon-browser/gtk3-icon-browser.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Icon Browser
-Comment=An application that shows themed icons
-Exec=gtk3-icon-browser
-Icon=gtk3-icon-browser
-Terminal=false
-Type=Application
-StartupNotify=true
-Categories=Development;GTK;
-NoDisplay=true

diff --git a/demos/widget-factory/Makefile.am b/demos/widget-factory/Makefile.am
index a6bfbdc37c5a3d63f608e77df96f0ae2c2c38e23..bc94f9b859b67e584d822fcbbe76e9cbb98525b6 100644 (file)
--- a/demos/widget-factory/Makefile.am
+++ b/demos/widget-factory/Makefile.am
@@ -1,29 +1,29 @@
 include $(top_srcdir)/Makefile.decl
 
-bin_PROGRAMS = gtk3-widget-factory
+bin_PROGRAMS = gtk4-widget-factory
 
 desktopdir = $(datadir)/applications
-dist_desktop_DATA = gtk3-widget-factory.desktop
+dist_desktop_DATA = gtk4-widget-factory.desktop
 
-gtk3_widget_factory_SOURCES =          \
+gtk4_widget_factory_SOURCES =          \
        widget-factory.c                \
        widget_factory_resources.c
 
 BUILT_SOURCES =                        \
        widget_factory_resources.c
 
-gtk3_widget_factory_DEPENDENCIES =     \
-       $(top_builddir)/gtk/libgtk-3.la
+gtk4_widget_factory_DEPENDENCIES =     \
+       $(top_builddir)/gtk/libgtk-4.la
 
-gtk3_widget_factory_CPPFLAGS =                 \
+gtk4_widget_factory_CPPFLAGS =                 \
        -I$(top_srcdir)                 \
        $(GTK_DEBUG_FLAGS)              \
        $(GTK_DEP_CFLAGS)               \
        $(NULL)
 
-gtk3_widget_factory_LDADD =            \
-       $(top_builddir)/gdk/libgdk-3.la \
-       $(top_builddir)/gtk/libgtk-3.la \
+gtk4_widget_factory_LDADD =            \
+       $(top_builddir)/gdk/libgdk-4.la \
+       $(top_builddir)/gtk/libgtk-4.la \
        $(GTK_DEP_LIBS)                 \
        $(NULL)
 
@@ -40,12 +40,12 @@ appsicon32dir = $(iconthemedir)/32x32/apps
 appsicon48dir = $(iconthemedir)/48x48/apps
 appsicon256dir = $(iconthemedir)/256x256/apps
 
-dist_appsicon16_DATA = data/16x16/gtk3-widget-factory.png data/16x16/gtk3-widget-factory-symbolic.symbolic.png
-dist_appsicon22_DATA = data/22x22/gtk3-widget-factory.png data/22x22/gtk3-widget-factory-symbolic.symbolic.png
-dist_appsicon24_DATA = data/24x24/gtk3-widget-factory.png data/24x24/gtk3-widget-factory-symbolic.symbolic.png
-dist_appsicon32_DATA = data/32x32/gtk3-widget-factory.png data/32x32/gtk3-widget-factory-symbolic.symbolic.png
-dist_appsicon48_DATA = data/48x48/gtk3-widget-factory.png data/48x48/gtk3-widget-factory-symbolic.symbolic.png
-dist_appsicon256_DATA = data/256x256/gtk3-widget-factory.png data/256x256/gtk3-widget-factory-symbolic.symbolic.png
+dist_appsicon16_DATA = data/16x16/gtk4-widget-factory.png data/16x16/gtk4-widget-factory-symbolic.symbolic.png
+dist_appsicon22_DATA = data/22x22/gtk4-widget-factory.png data/22x22/gtk4-widget-factory-symbolic.symbolic.png
+dist_appsicon24_DATA = data/24x24/gtk4-widget-factory.png data/24x24/gtk4-widget-factory-symbolic.symbolic.png
+dist_appsicon32_DATA = data/32x32/gtk4-widget-factory.png data/32x32/gtk4-widget-factory-symbolic.symbolic.png
+dist_appsicon48_DATA = data/48x48/gtk4-widget-factory.png data/48x48/gtk4-widget-factory-symbolic.symbolic.png
+dist_appsicon256_DATA = data/256x256/gtk4-widget-factory.png data/256x256/gtk4-widget-factory-symbolic.symbolic.png
 
 update_icon_cache = $(top_builddir)/gtk/gtk-update-icon-cache$(EXEEXT) --ignore-theme-index --force
 

diff --git a/demos/widget-factory/data/16x16/gtk3-widget-factory-symbolic.symbolic.png b/demos/widget-factory/data/16x16/gtk3-widget-factory-symbolic.symbolic.png
deleted file mode 100644 (file)
index d40786f..0000000
Binary files a/demos/widget-factory/data/16x16/gtk3-widget-factory-symbolic.symbolic.png and /dev/null differ

diff --git a/demos/widget-factory/data/16x16/gtk3-widget-factory.png b/demos/widget-factory/data/16x16/gtk3-widget-factory.png
deleted file mode 100644 (file)
index d1c09e0..0000000
Binary files a/demos/widget-factory/data/16x16/gtk3-widget-factory.png and /dev/null differ

diff --git a/demos/widget-factory/data/22x22/gtk3-widget-factory-symbolic.symbolic.png b/demos/widget-factory/data/22x22/gtk3-widget-factory-symbolic.symbolic.png
deleted file mode 100644 (file)
index a290375..0000000
Binary files a/demos/widget-factory/data/22x22/gtk3-widget-factory-symbolic.symbolic.png and /dev/null differ

diff --git a/demos/widget-factory/data/22x22/gtk3-widget-factory.png b/demos/widget-factory/data/22x22/gtk3-widget-factory.png
deleted file mode 100644 (file)
index 5b02f1d..0000000
Binary files a/demos/widget-factory/data/22x22/gtk3-widget-factory.png and /dev/null differ

diff --git a/demos/widget-factory/data/24x24/gtk3-widget-factory-symbolic.symbolic.png b/demos/widget-factory/data/24x24/gtk3-widget-factory-symbolic.symbolic.png
deleted file mode 100644 (file)
index 7760a61..0000000
Binary files a/demos/widget-factory/data/24x24/gtk3-widget-factory-symbolic.symbolic.png and /dev/null differ

diff --git a/demos/widget-factory/data/24x24/gtk3-widget-factory.png b/demos/widget-factory/data/24x24/gtk3-widget-factory.png
deleted file mode 100644 (file)
index 4944ff1..0000000
Binary files a/demos/widget-factory/data/24x24/gtk3-widget-factory.png and /dev/null differ

diff --git a/demos/widget-factory/data/256x256/gtk3-widget-factory-symbolic.symbolic.png b/demos/widget-factory/data/256x256/gtk3-widget-factory-symbolic.symbolic.png
deleted file mode 100644 (file)
index a95b9b0..0000000
Binary files a/demos/widget-factory/data/256x256/gtk3-widget-factory-symbolic.symbolic.png and /dev/null differ

diff --git a/demos/widget-factory/data/256x256/gtk3-widget-factory.png b/demos/widget-factory/data/256x256/gtk3-widget-factory.png
deleted file mode 100644 (file)
index 493ecfa..0000000
Binary files a/demos/widget-factory/data/256x256/gtk3-widget-factory.png and /dev/null differ

diff --git a/demos/widget-factory/data/32x32/gtk3-widget-factory-symbolic.symbolic.png b/demos/widget-factory/data/32x32/gtk3-widget-factory-symbolic.symbolic.png
deleted file mode 100644 (file)
index 1f2f6cd..0000000
Binary files a/demos/widget-factory/data/32x32/gtk3-widget-factory-symbolic.symbolic.png and /dev/null differ

diff --git a/demos/widget-factory/data/32x32/gtk3-widget-factory.png b/demos/widget-factory/data/32x32/gtk3-widget-factory.png
deleted file mode 100644 (file)
index 5aa1786..0000000
Binary files a/demos/widget-factory/data/32x32/gtk3-widget-factory.png and /dev/null differ

diff --git a/demos/widget-factory/data/48x48/gtk3-widget-factory-symbolic.symbolic.png b/demos/widget-factory/data/48x48/gtk3-widget-factory-symbolic.symbolic.png
deleted file mode 100644 (file)
index 201eeb7..0000000
Binary files a/demos/widget-factory/data/48x48/gtk3-widget-factory-symbolic.symbolic.png and /dev/null differ

diff --git a/demos/widget-factory/data/48x48/gtk3-widget-factory.png b/demos/widget-factory/data/48x48/gtk3-widget-factory.png
deleted file mode 100644 (file)
index 751c209..0000000
Binary files a/demos/widget-factory/data/48x48/gtk3-widget-factory.png and /dev/null differ

diff --git a/demos/widget-factory/data/512x512/gtk3-widget-factory.png b/demos/widget-factory/data/512x512/gtk3-widget-factory.png
deleted file mode 100644 (file)
index 33d4b5c..0000000
Binary files a/demos/widget-factory/data/512x512/gtk3-widget-factory.png and /dev/null differ

diff --git a/demos/widget-factory/gtk3-widget-factory.desktop b/demos/widget-factory/gtk3-widget-factory.desktop
deleted file mode 100644 (file)
index fecdcd0..0000000
--- a/demos/widget-factory/gtk3-widget-factory.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Widget Factory
-Comment=A showcase for GTK+ widgets, designed for testing themes.
-Exec=gtk3-widget-factory
-Icon=gtk3-widget-factory
-Terminal=false
-Type=Application
-StartupNotify=true
-Categories=Development;GTK;
-NoDisplay=true